Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 13 Jul 2011 03:40:18 +0000 (20:40 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 13 Jul 2011 03:40:18 +0000 (20:40 -0700)

Trivial merge